From 3df53167a2e65688b8d7adb538745db636208d74 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 12 Nov 2015 22:36:50 +0000 Subject: [PATCH] Remove PHP detection from entry points other than index.php The following entry points already didn't have it: * opensearch.php * thumb.php * thumb_handlers.php Now removed from api.php and load.php as well. The check was broken because these entry points use the 'use' keyword for PHP namespaces, which results in a syntax error on PHP < 5.3. The check remains in index.php, mw-config/index.php, and Maintenance (for e.g. install.php). Bug: T112942 Change-Id: I9026d69ddfb3e02612256b4a9df525c432bb33c6 --- api.php | 5 ----- load.php | 5 ----- 2 files changed, 10 deletions(-) diff --git a/api.php b/api.php index af7c452550..83c1373c14 100644 --- a/api.php +++ b/api.php @@ -35,11 +35,6 @@ use MediaWiki\Logger\LegacyLogger; // So extensions (and other code) can check whether they're running in API mode define( 'MW_API', true ); -// Bail on old versions of PHP, or if composer has not been run yet to install -// dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+. -require_once dirname( __FILE__ ) . '/includes/PHPVersionCheck.php'; -wfEntryPointCheck( 'api.php' ); - require __DIR__ . '/includes/WebStart.php'; $starttime = microtime( true ); diff --git a/load.php b/load.php index e65b09ef17..43c2fafce8 100644 --- a/load.php +++ b/load.php @@ -24,11 +24,6 @@ use MediaWiki\Logger\LoggerFactory; -// Bail on old versions of PHP, or if composer has not been run yet to install -// dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+. -require_once dirname( __FILE__ ) . '/includes/PHPVersionCheck.php'; -wfEntryPointCheck( 'load.php' ); - require __DIR__ . '/includes/WebStart.php'; -- 2.20.1